Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Jul 2010 14:43:25 +0000 (14:43 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 22 Jul 2010 14:43:25 +0000 (14:43 +0000)
commit4073c8f68ab18bb7a4a664afcf2c61ec49623cab
tree441401fa5516636696e2a4cb552b1cb652c10523
parenteddf20f49a2416bdb9a17bf96b2bf76092a49f39
parent52b527f9717f6c0f4c6cf53e545fd31ee0607a6d
Merge from mainline.